* process.c (Fnetwork_interface_info): Declare local only if needed.

diff --git a/src/ChangeLog b/src/ChangeLog
index 899ee14686d3caaa8885377dce4f03000649ce59..0f77f9af8c1d558ede553c2a40c0a327697ee37c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * process.c (Fnetwork_interface_info): Declare local only if needed.
+
 2011-08-13  Jan Djärv  <jan.h.d@swipnet.se>
 
        * process.c: Include ifaddrs.h and net/if_dl.h if available (Bug#8477).

diff --git a/src/process.c b/src/process.c
index b3c295cecde3f95865b000965a357505c3f80827..9d20d0c2b091a8870a93991931f8cf577728d5fd 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -3726,7 +3726,8 @@ FLAGS is the current flags of the interface.  */)
   Lisp_Object elt;
   int s;
   int any = 0;
-#if defined(HAVE_GETIFADDRS)
+#if (! (defined SIOCGIFHWADDR && defined HAVE_STRUCT_IFREQ_IFR_HWADDR) \
+     && defined HAVE_GETIFADDRS && defined LLADDR)
   struct ifaddrs *ifap;
 #endif